messageTray: Clean up and consolidate code for tween completion

https://bugzilla.gnome.org/show_bug.cgi?id=685341

diff --git a/js/ui/messageTray.js b/js/ui/messageTray.js
index 5e92141832b58e61ba033c2099c9877a0b47d58c..982940abe5529fb8586ac5030f7b56017ee8222b 100644 (file)
--- a/js/ui/messageTray.js
+++ b/js/ui/messageTray.js
@@ -2141,17 +2141,9 @@ const MessageTray = new Lang.Class({
     },
 
     _hideDesktopClone: function(now) {
-        if (now) {
-            this._desktopClone.destroy();
-            this._desktopClone = null;
-            this._desktopCloneState = State.HIDDEN;
-            this._bottomMonitorGeometry = null;
-            return;
-        }
-
         this._tween(this._desktopClone, '_desktopCloneState', State.HIDDEN,
                     { y: 0,
-                      time: ANIMATION_TIME,
+                      time: now ? 0 : ANIMATION_TIME,
                       transition: 'easeOutQuad',
                       onComplete: Lang.bind(this, function() {
                           this._desktopClone.destroy();